From: Leo Date: Fri, 4 Mar 2011 08:01:24 +0000 (-0800) Subject: * lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139) X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~4534 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=9b5f75fc03944be1926a218759f029ad8ba1c03d;p=emacs.git * lisp/vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139) --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ce0affa2dd9..f70f91727b7 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -10,6 +10,8 @@ 2011-03-04 Leo + * vc/diff-mode.el (diff-mode): Fix whitespace-style. (Bug#8139) + * time.el (display-time-world-list): Fix typo. (Bug#7571) 2011-03-04 Zachary Kanfer (tiny change) diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el index 13d10f02b41..9ccb37f3a55 100644 --- a/lisp/vc/diff-mode.el +++ b/lisp/vc/diff-mode.el @@ -1266,7 +1266,7 @@ a diff with \\[diff-reverse-direction]. ;; Set up `whitespace-mode' so that turning it on will show trailing ;; whitespace problems on the modified lines of the diff. - (set (make-local-variable 'whitespace-style) '(trailing)) + (set (make-local-variable 'whitespace-style) '(face trailing)) (set (make-local-variable 'whitespace-trailing-regexp) "^[-\+!<>].*?\\([\t ]+\\)$")